Fix the legacy %-build targets for dist installation of

guest kernels.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/Makefile b/Makefile
index 10b1fc8715d36e5d3ed37caa3a97922ead657230..7b513c620924edc1f62a35363d01b725ada8cb04 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ install-tools:
        $(MAKE) -C tools install
 
 install-kernels:
-       for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
+       for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
 
 install-docs:
        sh ./docs/check_pkgs && $(MAKE) -C docs install || true

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index e44a84e5427718fd3b525e102e476f137b201afa..19887c511784a791641cf0055c8437710b1a6205 100644 (file)
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -87,9 +87,17 @@ ref-%/.valid-ref: pristine-%/.valid-pristine
        touch $@ # update timestamp to avoid rebuild
 endif
 
-%-build:
+%-install:
        $(MAKE) -f buildconfigs/mk.$* build
 
+%-dist: DESTDIR=$(DISTDIR)/install
+%-dist: %-install
+       @: # do nothing
+
+# Legacy dist target
+%-build: %-dist
+       @: # do nothing
+
 %-delete:
        $(MAKE) -f buildconfigs/mk.$* delete